Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 1 Feb 2011 02:18:44 +0000 (18:18 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 1 Feb 2011 02:18:44 +0000 (18:18 -0800)

Trivial merge